From: Kenichi Handa <handa@m17n.org>
Date: Wed, 28 Dec 2011 07:57:14 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2326^2~3398
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d23ab8e8726ecb7e3554644857b4a58e5f7408f1;p=emacs.git

merge trunk
---

d23ab8e8726ecb7e3554644857b4a58e5f7408f1